From: Maxim Ermilov <zaspire@rambler.ru>
Date: Mon, 22 Mar 2010 20:41:26 +0000 (+0300)
Subject: workspacesView.js: Fix dropping window on +
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10269
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b93cb4b976bcfcb6fe5b61309e50921113f83976;p=gnome-shell.git

workspacesView.js: Fix dropping window on +

https://bugzilla.gnome.org/show_bug.cgi?id=610191
---

diff --git a/js/ui/overview.js b/js/ui/overview.js
index 3a5278ac1..92f377a79 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -262,6 +262,7 @@ Overview.prototype = {
 
         // Show new workspacesView
         this._group.add_actor(this._workspaces.actor);
+        this._workspacesBar.raise(this._workspaces.actor);
         this._dash.actor.raise(this._workspaces.actor);
     },
 
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 6e3016155..9b45fbaee 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -259,6 +259,11 @@ GenericWorkspacesView.prototype = {
 
     _activeWorkspaceChanged: function() {
         throw new Error("Not implemented");
+    },
+
+    _acceptNewWorkspaceDrop: function(source, dropActor, x, y, time) {
+        this.addWorkspace();
+        return this.acceptNewWorkspaceDrop(source, dropActor, x, y, time);
     }
 };
 
@@ -453,11 +458,6 @@ MosaicView.prototype = {
         let metaWorkspace = this._workspaces[removedIndex].metaWorkspace;
         global.screen.remove_workspace(metaWorkspace,
                                        global.get_current_time());
-    },
-
-    _acceptNewWorkspaceDrop: function(source, dropActor, x, y, time) {
-        this._addNewWorkspace();
-        return this.acceptNewWorkspaceDrop(source, dropActor, x, y, time);
     }
 };
 
@@ -1306,11 +1306,6 @@ SingleView.prototype = {
         let metaWorkspace = this._workspaces[removedIndex].metaWorkspace;
         global.screen.remove_workspace(metaWorkspace,
                                        global.get_current_time());
-    },
-
-    _acceptNewWorkspaceDrop: function(source, dropActor, x, y, time) {
-        this.addWorkspace();
-        return this.acceptNewWorkspaceDrop(source, dropActor, x, y, time);
     }
 };